Merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 14 Jan 2006 00:04:06 +0000 (01:04 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 14 Jan 2006 00:04:06 +0000 (01:04 +0100)
commitf2a2bc324832af65acc8bbed16e75186a31b622d
tree968878d6c13bd1757d57664468433f54a814c5a4
parent180a69c1e2f4c2c47dfcbab32bfdc33eacbe92f4
parentc9a14b06a442b2030969d766e67cdbd5d1b9dd62
Merge with xen-ia64-unstable.hg